| commit | a77a51375dec1ea55c96563953187d6ce3d924cd | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junio@hera.kernel.org> | Fri Jun 08 16:13:44 2007 |
| committer | Junio C Hamano <junio@hera.kernel.org> | Fri Jun 08 16:13:44 2007 |
| tree | bd5e64c4f3d367dcf2be694575f0e5edcb03b1a7 | |
| parent | 359b40ddcc057e3c5e382544a151c97db2db5002 [diff] [blame] |
Autogenerated HTML docs for v1.5.2.1-144-gabc40
diff --git a/git-merge-index.txt b/git-merge-index.txt index b8ee1ff..17e9f10 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt
@@ -59,7 +59,7 @@ This is modified MM in the branch B. # merge2 This is modified MM in the branch B. # current contents -or +or torvalds@ppc970:~/merge-test> git-merge-index cat AA MM cat: : No such file or directory @@ -85,4 +85,3 @@ GIT --- Part of the gitlink:git[7] suite -